Toward a Composition Made Whole